package com.yzhd_yl;

<<<<<<< HEAD
<<<<<<< HEAD
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import springfox.documentation.swagger2.annotations.EnableSwagger2;

@EnableSwagger2
@ComponentScan(basePackages = { "org.springframework.security.crypto.bcrypt"})
=======
=======
>>>>>>> dad41e9b0944ab40b7e82acd44af59e600647dd4
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@MapperScan("com.yzhd_yl.dao")
<<<<<<< HEAD
>>>>>>> dad41e9b0944ab40b7e82acd44af59e600647dd4
=======
>>>>>>> dad41e9b0944ab40b7e82acd44af59e600647dd4
@SpringBootApplication
public class YzhdYlTravellingAllApplication {

	public static void main(String[] args) {
		SpringApplication.run(YzhdYlTravellingAllApplication.class, args);
	}

<<<<<<< HEAD
<<<<<<< HEAD
	@Bean
	public PasswordEncoder passwordEncoder(){
		return new BCryptPasswordEncoder();
	}
=======
>>>>>>> dad41e9b0944ab40b7e82acd44af59e600647dd4
=======
>>>>>>> dad41e9b0944ab40b7e82acd44af59e600647dd4
}
